commit 3d1b5a1ebc2e4d9c3323a8f2b1fac732562968b5
author Junio C Hamano <gitster@pobox.com> Fri May 17 23:34:02 2013
committer Junio C Hamano <gitster@pobox.com> Fri May 17 23:34:02 2013
tree 49e1d04b52edbaa0b3d2fc549ad3cdbe30f9e1ee
parent ba7fe50148ec50de8394e1fe0f672c47bf6d4c17

Autogenerated HTML docs for v1.8.3-rc3 

git-mergetool.html

diff --git a/git-mergetool.html b/git-mergetool.html index 09fcc21..e9cddc9 100644 --- a/git-mergetool.html +++ b/git-mergetool.html @@ -746,7 +746,7 @@  <h2 id="_synopsis">SYNOPSIS</h2>   <div class="sectionbody">   <div class="verseblock">  -<pre class="content"><em>git mergetool</em> [--tool=&lt;tool&gt;] [-y|--no-prompt|--prompt] [&lt;file&gt;&#8230;]</pre>  +<pre class="content"><em>git mergetool</em> [--tool=&lt;tool&gt;] [-y | --[no-]prompt] [&lt;file&gt;&#8230;]</pre>   <div class="attribution">   </div></div>   </div>  @@ -863,7 +863,7 @@  <div id="footnotes"><hr /></div>   <div id="footer">   <div id="footer-text">  -Last updated 2012-08-27 14:06:30 PDT  +Last updated 2013-05-17 16:33:07 PDT   </div>   </div>   </body>